ADD: Added CLI checking.