Core: Adapted model class to 2.0