v1.0.10: Adding endpoint sorting support