Now adds id tag to entries