Use more efficient data structure