Added reworked index