Adding controller parameters (cherry-picked from andrepuschmann - thanks...)