Added class names to handlers