Make separate class from Builder class