Additional index Refactor