Refactored util module imports