Minor Bug Fixes
Updated Models Namespace