Improvements for parsing the namespace for Models