Revised the report submit classes
Cleaned up the code and removed the redundant classes
Added the push Id