Fix script. Add commands and a Sub-Manager