Add more model classes