Refactoring. Now, there is just one handler.