FIX: Cleaner indexing