Fix dictionary and model generation