Wont this be unneeded once we have the proper DI container to access to oc apis? since this is basically a wrapper around the static apis