Builder class implemented initially