Re-add messageClass variable - accidentally removed this