Refactor du-command and add-bucket-command