Added Charset and constructor handling