Feature/6199 workspace tree storage