Extends clause removed from grammar;
Indexes changed