Updated model classes