Made the builder more flexible.