Stripped out all additionalKeys dependencies