Simplify Handler types