Adapted to changes in ResultSet of Crossdata