Completed and Refactored USI mods