Refactor and wrapper methods