Changed sessions to use base sessions