Added support for default parameters