Add AFR CLI Enhancements