BuildResponse refactor