Improving adapters and OVs instead of HashMaps