Better handling of DynamicTypes