Making Builder a little more flexible