Added 1 more index for faster look-up