New target "key" and some improvements