Refactor adapter includes