Before refactoring server wizard
Working on the server adapter