Rename Text to Message, add some Javadocs