Resolve circular dependencies (OMS-507)