Refactored utility classes