Message (draft) + improvements + core classes