adding support for newer endpoints