Updated assemblers for parent id changes
A little more work towards supporting inheritance