CS
Fixed uuid issues
Fixed duplicate code. The core handles everything on its own