Add escaping and embedded metrics