Move charset into header
Switch back to ws for performance