Add dictionary support