Add tag rewriting
Add version field