Refactors UsagePointBuilder to return multiple usage points