Added offline modifications for loading and network-back cases