Refactored adding more Traits to decouple Model classes