Some classes removed. QueryManager more elaborated. Still missing a lot.