AccountAPI refactoring