Added new classes, added search for most models.