Added XE2 support