Hack: trying to get rid of dependency to the operational API for now...