Made params more consistent and transparent