Model base
Refactored models