Start refactoring of Application state from OAuth library