removed the generic query classes and added the specification attribute and some more stuff
Added simple test extension from Mark Nijhof