Removed new object instantiation in favor of builder.