Added more analysis types.