Refactored util and UI interfaces