Adding logic for CROSSDATA-312