Refactor the tags a bit to make the tags could reuse the env markers. They suppose to be the same thing.