Updated to MS refactoring