Replaced OptionBuilder with Option constructor to make it thread-safe