Added optional arguments to the script