continue migration to Vaadin 7; extend functionality