Utils refactored