Added more functionality for non logged user