Made SQL params more homogenous