Added rawhooks, to allow better additions