Improved ButtonHashingStrategy