Added interfaces for managed infrastructure
Ran codemaid cleanup