Added basic infrastructure for creating a builder