Add support for optionally including the key files