Refactoring common model