Improved raport generation.