Updated Dictionary class