New Factory method for messages added
Merge origin/master