added guid auto-gen support