Expanding Core Messaging Functionality - P2