Added support for DynamicPairs