Initial migration to new struct message