Added more optional arguments.