CSRF token added, key handlers added