Adapted to crossdata changes