Changed Id type from long to Guid