Add years and weeks to FormatTime