Updated integration with MPS, to work properly with build 564+