Updates to use keystone session