Update to new endpoint components