[EMBPD00149628][EMBPD00149621] Separated WM into WM and CE for ease of non-CE support in APIs