Added better timezone handler