Moved to a builder class.