Interfacemgr: Refactoring and minor fixes