Modify BuildCommand, RunCommand