Add keep_containers option