Following some changes to the underlying type definition/extension code, further refactoring will be happening related to core MVC classes