Add Forgery support