Added support for required parameters