Jon: adding message classes