Preparing for gwt version