Refactored to use SimpleMessages 0.0.3