some minor change on Node and Keystorage