Started adaption of JSON-bundle to non-depth-mode