Added sorcery users + sessions
Resolved merge conflicts