Starting new module to refactor API differences