Removed setClassPrefix: it's now automatically determined
Got rid of queriesToSave
Cleanup