Some updates to the builder