simplify handlers binding, change compilation unit