updates to support timezone attribute