Static adapter refactor code finished