little modifications in many model classes