Add Parameters

Replaced static variables with dynamic params.