Improved class mapper parsing. Closes #91.