Add potential performance enhancement