Added GUID and RAND tokens support