Added Params support