Add support for cancelling the builder and add a descriptive name for the builder