- Update methods to reduce the number of identical queries and move to HashMap