Using a ScheduledAction in order to ensure correct subscription behaviour.

Signed-off-by: David Marques <dpsmarques@gmail.com>