Replaced builder_t objects by simple builder_function_t functions