Fixed CLI import and conditional