Modify interface of model classes