Fixed compatibility issues with new USG refactored code. IDs will be owned by USG