Refactored exported methods