Added more model definitions