Adding messaging and tracking features