Refactored common model code to Concerns