Added feature for vaadin addon