Updated syntax and added options.