Adds timezone support