Switch model_list to entityType for 'fixed' dataset