XD-1343 Added XD extension mechanism