Integrating EntryBased (and FileEntry) into current code.