Refactored helpers