Refactor Class
Add indexer file