Added XBToolkit and data models