Updated to use the refactored Shell API