Make boost fields optional