Params refactor