Added support for params