Removed Type-Enumeration and added "infrastructure" for models