Fixed channle mapping for new model class