[WIP] Refactor ServiceManager