added support for DynamicDocument & DynamicField