Support more field types