Revamp and simplify handlers