Added ESI and CSRF