Add support for some class-level indexes