updates to how the mapping is handled to allow children in data