Updated endpoints to be simpler