Core/Entites: Updated GUID format