Avoid using sessions when not needed