Added more record type and plots