Add and modify model classes