Revised Node class