Update templates to 2.0 format
Add calculated throughput values
Add more graphs