Now building messages on import