Improve Pins Index