Modification provider/list + simplification for now