Refactor of session basket