Rearranged count endpoints for readability