Implemented new routing properties in the data layer and fixed Index presentations.