Add pub/sub. Change the events name