Added two parameter handling