Improve Parent Child mapping as discussed in Issue 169 in the main repo.