Refactored USMap