Added support for embedded arrays