adapt to adp-multi refactorings