Added tags and automatic tag update