Added some default parameters