Made Changes to Builder Pattern