What did the term matter include after the 20th century?