Report building - Phase 2