Refactored util classes