added tag mapping