Added entity type field and finalized the feed forms