Fixed internal classes in the index