Added keyed handlers in action annotations, making testing easier