Upgraded to work with GWT 2.5.0