Adding logic for CROSSDATA-240