Updated extension to reflect new guid validation scheme