Added jsf support