Add the 'refactored' helper