Some changes for solving CROSSDATA-299