add handler support