Added support for complex container serialization.