Fix for Dictionary changed from object to trait