Moved some function of builder