Enhanced DataDict support