Refactoring
Add handler routes