Finished the Custom Session Manager plumbing