Replace Messages with Report class