Port new API to GWT