Added endpoint parametrization