Add more wrapper options for fields