Added in extended fields