Added Conditional parameters