Fixed sample
Missing annotations
Charset accessors, de-deprecating