added support for contextful GWT scenarios