updated endpoints usage for version 1.8.5 and beyond