Added Additional Tables To Store All Data