Changed field sets to tables