update completion script
Refactor common options to BaseCommand class