Adding some indexes. Fixed parsing issue