Adding timezone support in configuration