Refactored the uuid out to extras