Added sort fields
Removed index file
Element id