Updated endpoints compatibility with older established implementations.