Moved index management to base class