Changed child names and added lists