Updated to support cert/certfile independantly of key/keyfile