Fix #1 : add possibility to add specific handler