New vaadin-based version