Updated for auto-detect timezone