DJR:Added node check and keys loading