Added case statements for missing maps
Merge pull request #108 from wriley/issue-107

Added case statements for missing maps