Added message handler support
Worked on handler testing