Add code comment
Support adding new indices