Changed name of handlerFactory to handlerBuilder.