Added character classes