Updated to new Index Format
Added Class Header