Refactored util imports