Port from vaadin 6 to 7