Finishing work on dictionary