adding guid support.