MS-604 Update to be more maintainable