[TASK] Update AnalyzeCommand  - closes #16