Added support for XCrud