Update Builder Pattern

Update implementation for Builder Pattern