Add capability for multi-column indexes