Adjusts helper method to remove dependency