Refine code Add shell