Office and Workplace entities added; relationship changed