Separated Key Scope annotation from Key Annotation
Method template correction for separated Key Scope annotation from Key Annotation
remove storage key scope definition