Changed tagging (incomplete)
Moved Cf-specific tag information as arguments to NewMapping