Added the option to name params to set them later

- first step in cachable/reusable/extendable queries
Updated to version 2
Added extra javadocs/changed api slightly