Add support for universe endpoints