cleanup
New structure for Dictionary
Introduce Fragment dictionary for sake of simplicity