Extended session/user/roles draft