Could we add sesson IDs here for supportability?