Add MessageListener support