Added dictionary capabilities