Moved add_index to 'change' method