Implemented generic query parameters. Closes #6.