Added support for map keys and factory methods (basic).