added more model classes