Added implementation to XBMapper