Add new option to disallow parent change