Refactoring of handlers and checks