added guid support