Resolving a handler
Refactor