Exercise 2: Added Indexing To Entries