Refactoring: add wrapper methods