Changed query polymorphism and started AttributeQueries