Add support for holding an index instead of fieldname