Updated and added new field types