Make the way reports are defined more extensible