Added qualifier to value index