Switch to hash containing array for indexing points