small changes to TypeMapper