Fix CS
Update MessageHandler API
Fix CS