Added parameters handler