Fixed service lookup
Upgrade to Vaadin 7