Removed constraint on models: choice classes could not have contents