Further progress to getting endpoints ready