Add @index support