Added onMessage delegate