Add Support for XE3.