Added tag spec and mapped tag instances