added option to messaging and sensors