Added parent/child keyword distinction and validation