Added support for dynamic types.