First commit including support for SSO