[RFC] Mapping for children and mapping fixes