Improvements for D365

< Improvements for...