Added message classes from Sunshine.