Adapt to class package move in core-api