Add aggregate builder & range/distance builder