Rework params and options