Refactored Messages. Fixes #106