Added tag resolution