Added more data types and analysis methods.