Improve direct reporting (Gap)
Next release (Plateau)