Updated Functions and Integrated with jsf