Not needed anymore, as I merged all handlers