Refactored for new utils module