Added validation and Model Locations