Updates to add node container