Refactored to include the util package