Some first steps towards timezone support