adding support for two-column indices