Improve puppet command