WIP: Allow multiple endpoints