Update shell to support 2 levels of coverage