Adapted to changes in Crossdata