Updated widget to support Vaadin 7 rc2