Handle more field types.