Some modifications on endpoint