Improved dictionary creator