Unicode fix, struct-class change