Removed model class into external module