add Optional as return type for all indexes