Fix #6 : Integrated message factory into message builder.