Add basic structure of Builders and made the test pass