CLI enhancement, now use options