Support fields optiong

For #13