Added support for map expressions.