Attach records to parents better on save