Repackage commands and adjust accordingly