Added more JSF adaptions