Refactoring Actions handling in a good way.