GWT Wrapper further enhancements