Updated dictionary storage format
Basic functionality is working