Added detection of Generic keyfile