Support enabling dictionary nodes

Change-Id: I423f6294b8076b4695b26374ed0445698ece38ab