Close #4 Support untyped mappings