Added models.
Updated to include a classmap.