Extended mapping to be able to work with up to eight query parameters