Improve binary key recognition