Optimise with additional indexing