Refactored Utilities plugin