Added in embedded fields and start indexes.