Initial modifications. Adding storage node