Small tweaks, added KeyName