Add build for clause and guard