Fix model mapping