Changed parameter handling, allow using named parameters within building the query