added support for new fields on the kid entity