Added RegularDictionary and some clean up