added initial support to xml report generation
refactorings