Revamped CLI check