Switched to single App Message data type