Migrating to Vaadin 7