Added preliminary message support