Added API improvement suggestions
Convert distance to quantity just once