Utah data sources refactor, initial changes.