Fix cirular import dependency (OMS-507)