Added more model classes