+ Added XE7 compatibility