Added more optional arguments