Organized changes in ContainerLaunch