Add new rave implementation