This sucks, but just temporary until the sotrage engine deals with nested objects properly