Added additional inputs