Added a couple more field types