Add some indices to speed up access