Migrate to nodefied protocol