Changes for jsf