Reorganized ModelManager class hierarchy
Enabled Fluent API