Adding efficiencies to Session