Fixing the Dictionary class