Additional calls and refactoring