Moved functions to Builder class