Added query parameters handling