Rewrite of demands to extend from Session class