Added new templates, refactored report generation