Adds Report with a better structure