CS
Fixed uuid issues
Fixed duplicate code. The core handles everything on its own
Merge pull request #17 from Toflar/develop

Fixed UUID issues and duplicate code