Update to new Common