Update to handle BuildResult properly