Actually this IS needed to work offline (with Offline created ESDs)