Updating endpoint to be generic