Add support for Security Token Service