Improve Node Class