Refactoring: moved adaptMethod functions in different modules