Adding dictionary storage support.