Change timezone conversion to improve performance