Added support for keyfiles