Utility diversions framework

Utility diversions framework