Some improvements on handler

some improvements to 'make' a new callback for the handler