Fix models and working again new structured models