Better handling of childscopes