Add new tag and fix spec