Adding message handler

Author: Maulik Patel