Added query and query parameter api