Changes on Ximdex's core with the latest extensions