Pass through parameters correctly