Port to XLabs struture