Add support in index