Added addiitonal index fields