Simplify CLI
Additional checks