Refatored cli components