Improved the guid generator