Reduced operational overhead

Reduced operational overhead