Changing to config based messages