Also pulled out extract charset