More mappings for tsol
Merge pull request #438 from rjc123/master

More mappings for tsol