Remove cross origin check
Add keepalive timer