Added custom message class