Added default timezone and normalisation support