updated utility and session classes