Change Key Definition type
Nodes loading optimization