refactor Add to accept func handlers.