Changed to use JSF