Fix #11 - Usar pubsub