Addition of more endpoints