Added builder constructor; generated builder is now aware of is-set field