Added Index Class