Add build_match