Updated to match changes in Common.