Added message class and header