Updated Messaging API to allow less 'new' declarations