Milestone scenario 2 and Message refactoring