Added tags and years code