Add support for indexes on collections