Include of Guid code - #169