Refactoring - add params paramter