Added support for embedded objects v1.0.4