Refactored params usage