Adding changes for timezone