Added support for dictionary formats