Added Links, and Message Awareness