Modifications to SlotHandler, Node