Updated to use RequestScoped and SessionScoped managed beans