Update to use new msg system