Further tune mappings #578