Added additional optional arguments