Updated to work with latest Vaadin snapshot (~ V7RC2)