Started adding support for reports