Added better random string generation