model classes re-added