refactor QB Wrapper and Session models