Refactored model|collection Base