Add companion objects for model classes