[WIP][TASK] Add more advanced session handleling