Updating refactored class with builder