Adjust manage script to be consistent to master branch