Add Builder pattern part 1