Removed unnecessary class Dog, added UserIndexingStrategy
Removed unnecessary class. Extracted inline helper classes.