adjusting MSP according to the latest bf changes
moving MSP related data object to separate file