That's a good idea. I will extract this to a different builder method. Thanks for the suggestion.