Update to support latest master