Updating to work with new version of bldr