* CSRF class improvements