Dictionary Integration Overhaul