Handle more field types