<Shashank> Updating report for State inclusion and user management