Added support for keyfile