Add more end points completely. Stop trying to be so smart at the beginning and just create the stupid end points