TypeMapper  - performance improvements
TypeMapper - performance improvement
syntax error fix
TypeMapper - tests passing