Added basic message building functionality