Added some source report related stuff