Changed tag format for functions