Add some more info about handler names