Add support for non unique indexes