Fixes
Added GWT
Refactor