[Enhancement] Add explicit reporting