Added some features to reporting