Added message to event + Allow unresolved variables escaped by #