Added Custom CLI Functions