added more classes to builder