Upgrade dictionary definition use new wrapper

cc @sdougbrown @russellholt