Actions refactoring to use parameters