Changing is_container to container_type