fix editor integration and ide model generation as well