Add remaining indexes