Fix dictionary integration