Added New Class Structure and New Query/Data Storage