Changed to Template based reports