Adding locations and better timezone support