Improve character classes