Simplify handlers registration