Add XE7 support