Improve performance in add handler method