Adding GWT changes (preliminary, not functional yet)