better support for sessions under model