added XE4 support