Added message listeners support