Added support for GWT