Adding new V1Queriesand test, refactor clases