Implemented builder pattern

Implemented builder pattern
Removed builder interfaces