Added message handler classes
Merge origin/master