Updated to add new nodes