Added builder implementation to support some of the failing tests.