Added GXT support