Add support for adding endpoints