Removed unused imports
Expanded the model with new entities