Refactor param class