Tweaks before changing Child model