Remove more duplicate code from models