Some refactoring model classes