Updated: enhanced dictionary structure.