You're right, these should be moved to ORM specific model.