Added support for parameter overrides