Add Report and related classes