Added pubsub messaging and marker triggers