Add support for handling index operations