Adding Jonathan's term mappings