added map, list model types with tests