ChatHandler improved