Adding logic for CROSSDATA-270