Dropped the custom scope and depending on the vaadin-cdi module