Added in correct field types