Resolve #1 (Add index)