Timezone handling added