Add pool switch and CSRF_Guard