Use parent mapping in correct place