Add config_builder support