Added more field types, made setting safe