Updated to handle Yammer style changes