Add x-session-manager stuff